even more setup fixes