MISC Fixes