Tweaking a bunch of things for preview build