Update versions and minor clean-up