Fix issues with asset pipline