Fix some code by inspection