Fix bugs george was complaining about.