Switch out some symbols with better alternatives