ACRA fixes

Here is two small fixes while I was triaging the ACRA reports. These didn't seem worthy of an issue because they were quite straight forward fixes.

Fixes #1074 (closed).