Minor fixes on changes from merge