More fixes for dynamic runtime