Cleaned up more warnings