Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/f098b840-128b-4f08-b40f-d62d90c942a5