Fix #195
Fix #186
Fix #181
Fix #180
Fix #178
Fix #174
Fix #172
Fix #168
Fix #161
Fix #157