FIXES AND SUCH