FIx compile errors