Fixes due to merge split
Now compiles