Fix little problems after merge