And little more fixes