Fixed remaining issues with the library path