Fix minor code inspection flaws