Final fixes for 30282