Bunch of fixes