Property formatting fixes