Final fixes (for now)