Library: fixed problems