More fixes
Merge pull request #276 from twokul/moar-fixes

More fixes