More fixes for the public API (no override needed anymore).