Fixes to library finder modules to ensure previously set locations are kept