Fixed some wrong properties