Settings: Various build fixes