Merge pull request #274 from Wolfenswan/dev

Misc fixes