Small code changes from inspection