Fix up some issues encountered with Tony