Devon's fixes