Fix #101
Fix #106
Fix #105