Fix golang stuff