Merge fixes WIP