a few more fixes