Address some issues