couple of more fixes