Latest changes to ensure that everything is at the right version