Merging some fixes live.