Some minor fixes after the recent dep upgrades
Merge pull request #96 from wibblymat/minor-fixes

Some minor fixes after the recent dep upgrades