Miscellaneous changes  - Orlando patterns consistency.