Minor touch-ups, add requires