Merge in changes pre3 -> pre4
Add missing std qualifiers