Fixing a few compile errors