A few fixes.
Removed unused libs.