Final (I think) fixes.
Signed-off-by: John Hamelnik <john@johnhamelink.com>