Fix some small problems
Merge pull request #2 from jaccarmac/fix-extras

Fix some small problems