setup fixes