couple of refactor fixes in decision package