Golang hotfixes
More tweaks