Fix property apis