Arranged some integration errors