Sync with 1.5 fixes