Declare default serialVersionUID
Add missing "//-NLS-1$" tags