Merged in a bunch of fixes from main Radiant branch