Tidy capabilities; make sure some currently unused ones are recorded correctly