Integration bug fixes