Few more fixes