Assets plus other fixes