misc setup fixes