Workarounds to some serialization problems..