MORE FIXES