CMFM: Fix more deadlocks

Change-Id: If5895b6c40708e2417595b7b2e5b676c10ce6f6c
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>