fix some errors in pre-R16B02