Assets fixes #3