Rob's fixes