Fix issues in gosrc