Few more fixes to SO