Asset loader and minor fix