Fixes for recent changes

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 1.1
| Fixed tickets |

Changes required so that the Creating a CMS tutorial works.