a few more fixes.