Fixes from DP