Small current run bugfixes