Address some iso todos