Steve's fixes