Fixed some of them