- More magic library handling fixes