V2.5 fixes

Fixes #225 and #224