Deactivate all changes to check bit exactness to main. Add macros in 3 places that were missing.