Fix two last specs, clean up some debug output