Warning fixes and minor clean-ups