Bunch of Fixes