Removed more warnings