Fix property API issues