Fix a few minor niggles