Apply fixes for chrome and dt 1.10