Merge pull request #72 from bryan2894/jb43-legacy

A Few Fixes
(cherry picked from commit ad5c830478274b179f45061f2ebdcde5f1b1cd2b)