Final fixes (with Meld diff)