Fixing Misc Bugs