devices fixes across the board