Fix the bugs we saw today