a couple more fixes