Final attempts at bugs