Fixes for Offender API