Some fixes for FRB