Cleaned up even more warnings