Minor changes, tested with Go 1.1rc3