More changes to support Ubuntu storing libraries in /usr/lib/, even on 64-bit systems