lightly tweak POJOs