More cleanup, fixing tasks.