Clean up some rouge cases.