misc fixes for gcc pedanticness