Fixes after reverting to v6.0