More exrecise fixes