More cleanup!
Fix more things (hopefully)