Fix #4, #5, #6