Fixes to match the most recent mawar DB field names