Fixes for UTFGrid merge into master (#4765)