Libraries small fixes