Fix more bugs with 11.
Fix map order dependent tests for Go1.3