Fix another handful of warnings