Fix several issue when multiple messages sources are active. Fixes #3