As written, both issues were fixed ten minutes after I posted the comment.