Minor fixes to improve compatibility woth FA3.2