More CompTIA fixes!