Some misc changes

Needs to have required code merge into main EBXL repo