Fix folder import and notification.