mess build fixes after cleanup
mend