Fix bugs -- I think, I forgot, I'm not sure what's in this commit.