Fixes for first real setup.