emerge fixes