Fixes for handling strings