Few more fixes.