Build: Non-Functional, pre-Auth changes