Fixes to ensure the linearized version is in synch