Fix refactor bugs

2 jobs for master in 2 minutes and 14 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #24643
integration
argotk

00:00:33

 
  Quality
passed #24644
integration
repoquality

00:01:41