build fixes for new installs