Ben's fixes.