Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/e940c91e-747d-45f4-bff2-01cc2f18f70a