Fixed some attributes