Final fixes to half