More setup fixes