WF-1653 - Fixed Bugs.