Fixed stuff that's been broken for a year.