[kronosnet/kronosnet] c361b9: Now do it without causing more covscan errors