base: Improve various classes.