Fix more conventions, TODOs