Cleaned up rest of warnings