Make a few more things virtual fields