Various issues from big feature merges