Two issues with 3.1.0.411

Same error as I reported.