Further recently added fixes.