Fix marshal specs