Fixed inconsistencies between API and Impl (leading to errors)