More bug squishing, one of which was really stupid and made re-connecting to friends not work.