Fixed some integration issues