Localization: Fix search paths and update line numbers