Thanks to Stikki. Fixes for Calguy's latest changes to the core.