Fix: bugs relating to exporting null shapes