final go fixes