More fixes
Fixed gollum
Merge branch 'refs/heads/master' into dev-scrutinizer
Small fixes