Pull cactus for misc small bugfixes.