Miscellaneous small inspection changes