Additional tweaks for < and > chars