fixing issues found with namcap