Small fixes for base.