Fixes after merging

Merge messed up, but all is good now