NKH + BBT fixes

Signed-off-by: Galen Lockwood <galenlockwood@gmail.com>