Fixed various integration side effects.