Further build sanity, getting ready to port Settings