Integration fixes / porting