Additional multibyte character fix
Fix granularity in range as well as a few other fixes