Bump versions and misc cleanup