Some fixes towards working remuxing