Tweaks to handle properties files better