Fixing #2: Added proper handling of passed QR code
Fixing issues after upgrade