attempt at fixing compile errors