Few more fixes here and there