Final fixes attempt