Fixes.

Signed-off-by: Niel Vanterpool <nielingroup@gmail.com>