Fixed some fixes for a fix