DCAF Bugs Fixed