minor fixes on the go