More Misc Changes