Commit fixes for sub-issues 1, 2, 5, 9 and 10.

Found by: AppChecker <appchecker at cnpo.ru>
Patch by: me