Merge pull request #1716 from jeffbolznv/buffer_reference_fold2

Improved fix for buffer reference constants