couple more fixes