Knife bug fixes