Some more tweaks

FirstTime for AR and WF weren't updating, for instance