Fixing stuff reported by Lint