BUG fixes for runtime.