Glad you're enjoying the game. For reference, you can check the skill lists of classes you've unlocked with the Class Data key item,
For the first bug, do you remember if you started interacting with the NPC at the same moment Mary came in? I think I know what caused that issue, and went and reorganized that scene to sidestep it. As for the second bug, that's just on me, and thankfully wasn't too hard to fix.