Runtime bugfixes