Fix other compile errors