More small 2->3 changes