More Nymph fixes.