Tweak to fix library loads