Final fixes!
Assets fix