Bunch of fixes and small changes 3.4203