Fixes for NPC Jack

As suggested by o11c.