Added some bugs I came across today.