Fixing some of the issues reported by Sølvberget.