Improve npm compatibility