Fixes to make the libraray usable.