more setup fixes