Minor fixes
The libs themselves