Still fixes for assets-related issues