Fixes for dumb errors after removing go-func