Removing more warnings!