Made some forgotten inner classes serializable.