fixes in setup