small fixes to last