Minor changes after major change in prev commit