Fixes for a bunch more compile warnings