Fixed issues left after previous merge.