Minor bug fixes

Integration bug fixes