Fix bugs missed