Various fixes to make it stick together properly in the split architecture