Bugfixes in initial conditions