some setup fixes