More Bug Fixes

Fixed a few things that didn’t work.