Many files
- Fixed error notices
Merge branch '1.8.1'