Bunch of issues fixed