Fixes for missing library