Nailgun NTP improvements