Minor fixes to Cam's updates.