Nick O: Removed warnings