Improve virtual support even more, fix ordering in rules