Fix some bugs again