some minor changes for 4.4.4