Some more 'last' changes