Fixing a few code inspections