small setup fixes