Fixes from inspections