Last small modifications before first test run