source fixes (get compat for CM merges) - part 4

Signed-off-by: Humberto Borba <humberos@gmail.com>