Fixes for classref consistency.