Local setup fixes