Fixed some more stuff w/ integration