correction integration of recent patches