Fix integration issues with Hoboken 311