WIP fixes for marvel