Code review: 176560044: Bug fixes, issues: 34, 33, 32, 31 and 30.