Admin roles not set correctly

Since our upgrade to 3.2.1, a lot of folks that are Administrator in their sites don’t have certain capabilities set. For example, an Administrator does not have the list_users capability, so they cannot access the users.php page. They also didn’t have edit_theme_options. I used a script to add that capability to the admins, but I’m afraid I’m missing more capabilities.

Would you all recommend that I just write a script re-applying all the capabilities listed here:

http://codex.wordpress.org/Roles_and_Capabilities#Capability_vs._Role_Table

Any help would be great!