Fix mistakes during the4.4.1 merge