More fixes for internals.