Fix bugs by Aurora