Proper versions all around. Plus a minor fix.