Fix versions and whitespace