Fix a few exceptions