Fixing a restart bug and overlay bug.