Revert "Different fixes"
Merge pull request #367 from Zidisha/revert-366-different-fixes

Revert "Different fixes"