small fixes
Merge pull request #1686 from Kenneth-T-Moore/deriv

Fixing a test failure