Fixes issues when marshalling and unmarshalling parcelables