More Assorted Bug Fixes