Fixed issues caused by geometry changes