Fix more and cleanup.