Rob and Chris's fixes