Final fixes for all 3