Lint and TODO fixes