Fixed API inconsistencies.