Just a couple more fixes