Fixes for new setup.