Fix self-contained libs