Fixed level upgrade and direct save on load