small unshield fixes
unshield fixes