Final fixes to the start of pain