Fixed some