Modifying some minor issues, compatible now with GO 1.1