Miscellaneous changes for new R3 syntax