Most remaining warnings fixed and some small bugs are also. Split into commits for ease of reviewing.