Cleanup and fix proposal IDs.