• Fix some problems reported by codetools.