Merge "Fix two more locations that use the old setObject("buffer", ...) paradigm"