Fixed separate mice and lib issues