Fix a few more exceptions