Fix handling app starting at a different non-zero space