fixed up a few integration issues