attempt to fix 3.0 upgrade issues.
untested
Merge branch 'hotfixes' of github.com:GetSimpleCMS/GetSimpleCMS into hotfixes