more simple gov fixes