Head changes, merge fixes