Fix several minor errors
Squashed 'stronghash/' changes from 0db4669..9accbaf

9accbaf Fix undefined index

git-subtree-dir: stronghash
git-subtree-split: 9accbaf94ddc5e78af7c39439b035816977050a5
Merge commit '9cc10cf1e189847479fb698b20e87461163b3d01'