FIXES AND WHATNOT