minor tweaks to JDK serializability