Merge: Fix lib/realtime on osx