Address some problems