SOME FIXES