Minor tweaks
Fixed a critical bug with virtual fields