More runtime fixups