Last? fixes