Fix code to use new style properties