Minor setup fixes