Some minor performance boost and started media