Some more fixes for Prelink Support