Misc Bug Fixes