Fixed binary/lib suffixing inconsistencies (bug 539)