Fix More Bugs

More bugs have been fixed.