Fixes for autoon/off.