Fixing some interface inconsistencies.