Noted some bugs