Loose ends I stumbled across while demoing