More linearization fixes