Update versions.
Clean up laziness