Adam's fixes