Fixes related to falling brick test.