Fix #492 #575 #8