BUG: Even more fixes in setup script