Fixed some breaking changes