All of the fixes