St3 3047

Turns out after paring it down,it's just a couple of minor changes on top of what you've already done to make it run in ST3 build 3047