Fix a few minor bugs with selfing