Fixes for core runner