DCAF Front-end Fixes
DCAF FrontEnd Fixes2