Fix: emerge bugs