fixes for marvel