Fixed more NODROP runtimes