Export bugs fixed