Fixing up runtime