Port a few updates back into the CUT branch