An altered MineSweeper

I’ve been searching for an old project I did in college about a computer program to create and solve a special variation of the popular game MineSweeper where, instead of always one, you could have multiple bombs on the same cell and all the numbered cells are displayed at the very beginning of the game. And finally I found it!
On one of the modules of the program I designed, you could setup a grid where an armed cell could support up to $3$ bombs. For instance, a 3 x 3 grid could be presented like this:

$qquadqquad$

To solve the MineSweeper all you have to do is fill the empty cells with 0, 1, 2 or 3 bombs so that each numbered cell is adjacent to its own number of bombs (adjacent my be horizontally, vertically or diagonally):

$qquadqquad$$qquadqquad$

As you can see, you may fill the empty cells with numbers instead of bomb drawings. Just be sure to distinct them from the initial filled cells.

So, my challenges for you are:

CHALLENGE 1. Can you fill the three next grids using, at most, three bombs for cell? (The three grids are independent from each other). This challenge is just an warm up!!

$qquadqquad$$qquadqquad$$qquadqquad$

CHALLENGE 2. Fill the next 8 x 8 grid using the same rules (at most, three bombs for cell):

$qquadqquad$

PLEASE NOTE: There is only one solution for each grid.