Fixes on libraries