Fix fixes and improves.