Some fixes + workspace export test.