Fixing integration problems