Fix additional failures, I should go to sleep