NDP: Fixes