Some fixes for passing string classes