Fix a few symbols etc.