Fixes for berdirs review