Fixing a few things during testing