Fix bugs caused by last push