Fixes for 6.5.16 and QuickCRM