more solo fixes