Fix #46. Fix #44. Fix #43.