Fixing more warnings