Made changes to compile in go v1.1