CompTIA fixes