Tweak to package export