Continued fixing compile errors