SDK fixes.

Signed-off-by: John McCutchan <john@johnmccutchan.com>
Merge branch 'master' of https://github.com/johnmccutchan/spectre