Squashed some warnings