Fixes for mdas' review