Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/ab3ad85d-38bb-4758-b124-09e64619d552