Fixed more stop bugs.