Fixes for NaN & String values (collections & map)

See tests for detailed on what has been fixed.