Fix library names and retry logic