Removed some more pesky warnings