Fixes to _base.