Few more fixes (local branch is dirty, sorry)