Reclassify #670 and #656 as bugs