More fixes for the new paradigm