Fix few minor issues related to property files