Tweaks to Unite settings, should hopefully make things better