Fixing a few more exceptions