Additional fixes to app options reorganization.