Some small fixes from the checker report