Cleaning up Serializable warnings