[RFI] A couple of small issues