Merge fixes from liveblog-15 branch