Fixes some CIGARs