fixing compilation issues from rebase / merge