Final fixes to previous mistake