Fixed some more!