[#260] Hot fixes
Merge pull request #261 from akvo/feature/260_hot_fixes

[#260] Hot fixes