Fix #3, #4, #5.