Deactivate sleep mode - no aod and watchface

Having the latest beta with my 970,

automatic sleep mode activation with battery saving watch face and red shift. Works fine. 

when it deactivates the battery saving watchface stays (deactivated red shift). Need to go to watch face settings and apply my normal

watchface and I have it back. 

Another problem I can only resolve with a restart. Always on is deactivated. Even if I toogle

it off and on again in settings it does not work as expected. 

anyone experienced these issues as well?