Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/68aaaac3-c578-4a69-a723-39fc6d68aec8