Minor changes for app wizard implementation