Fix properties mess.