Fixing a few stray compile errors and warnings