Fix IAM bugs, add in jshit tweaks