Dana's fixes