Working around NPanday bugs