Fixes
Fix more things