Found two bugs, fixed one