Small fixes
Merge pull request #136 from mud-turtles-2014/fixes

Small fixes