Fixed some minor issues caused by last merge.