Fixed some like break issues.