Fixes regarding setup.