more bugfixes for variables during setup