Fixing devises bugs