Some Misc Fixes