Cleaned up more compiler warnings