The last of the fixes