Removed a couple of warnings