Fix #5 #7 #8