Cleaned up minor warnings