fixes for Parcelable objects