Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/8162d8ad-8217-4d86-8b95-9552867a02f5