Fixed QR Code issues, updated for new common version