Fix gpmsa compile errors