Fixed some, some fail