source fixes (get compat for merges) - part 2

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