Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/b35e31d1-5d4c-4209-85a4-a6fef1e2f006