A few more fixes....