Fix a couple of bugs introduced with last commits related to multiple CCA support. Signed-off-by: Eduardo Montoya <eduardo.montoya@nordicsemi.no>