Misc integration update