Some fixes to round detection.