Just fyi, both issues fix themselves if I wait long enough (I had not waited long enough previously before restarting)
I have this same issue! I'd also love to know a fix.