Resolved some assets issues