build: Non-bootstrap install fixes.