- Fixes for builds with custom library directories