Add missing override annotations
Add @Override annotation on toBuilder()

Fixes #73