various fixes FR