a few more fixes...