Fixes for Scratch V423 changes to unicode