Fixing a couple of warns