Brett's fixes