Fix bugs again