Fixed Some Integration issues