Cleanup install, tweaks for Buildyard build