Fixing compile errors I introduced