A few tweaks to make life in go nicer