r9b fixes