Smaller fixes and improvements across the platform