Fixes to address special characters