Defect #FW-8 Fixes