Fixing Thad's suggestions