Fixed minor breaking changes