Some STFLEngine improvements