marshal fixes