Small fixes in go progs