Misc Fixes again