Multiple integration improvements.