Fixes in few places, check commit to get known, with changes