Some cleanup for Q10320
Patch by @St3eT