Early fix for lock(this). Some tests are still failing.