First round of fixes for inspection