Assets Core

Minor fixes. See diff