fix remaining compile errors