Fix a test comment
Fix safe methods
Improve performance on last()