Fixes to Ben's kald_govt_info tree