Fixes to regular policy generation.