Fix things based on Tod's feedback