Removed some more warnings