Fix issues with assets