Fix #4 #8 #9