Fixed few odd situations.