Assets, minor bug fixes