ACT-2012 and ACT-2021 fixes