Fixed bugs/impl changes.