Attempt at fixing more compile errors