A couple more fixes