Nepton perfomance improvements