Fixes on integrate class