Other fixes See merge request !8
Fixes See merge request !7
See merge request !6
Fix resources See merge request !5
Intro See merge request !3
