Removed more warnings that are no longer true.