unshield fixes