Fixes for Build/Export/Deploy