FIx problems with Stoner.Core identified by JTB