Fixed interface inconsistancies.