final ng path fixes

Signed-off-by: Eric Nakagawa <ericnakagawa@gmail.com>