Changes in workaround files