Further setup fixes