Adding additional fixes for missing export directory, no controller added, etc.  Preview build