some fixes for d)