Begin work on trapping property cache flush errors
Minor fix for groups in menu entries