Assets fixes #4