Just some final config tweaks