Fix rmon, among other things