Fixed compatibility issues with pre-datastore factor pyon