Fix integration issues - cindy q4