Fixed build errors to support R16B