Small fixes to Export Library