[Minor] Minor zen mode code changes