various build fixes for 0.13.5