Fixed issue: Fixed installer assets issue and minor cleanup