fixing local issues