More fixes to remove UI calls in our base types.