Fixing things after faults in branch Joyce