Fixed some new implementations