first run bugfixes