Fix further issues introduced by qrcode addition.