fix build
A pass of tweaks