Multiple fixes

Enjoy your empty activity Richard!