More misc Fixes