V2.5 fixes

Fixes #225 and #224 which were introduced in /exposed by the v2.5 release.