Resolved some problems with global assests