Fixes for code inspections