Fixes to get things running again in the full setup.