Fix issues with properties files & formatting.