Cleaned up build warnings