Some minor changes made while trying to figure out a decent way to export a library