Updated flag handling, preparing for AntiAFK update