Fixed some of the fixes...