Removes a few more warnings