Small fixes. Added missing lib