More circle fixes