A couple of fixes

Including the snarky Foundations like comment bug