Update to work with pre-R16B