Fixes for the inevitable merge/build issues