Minor tweaks
Merge branch '10.10' of https://github.com/AJet/DFeedback into 10.10