Ongoing fixes

Supersedes https://github.com/rtCamp/rtMedia/pull/452