a few more fixes here