Attempt to improve preparing libs