Sorting out last few things