Fix two domestic partner-related bugs