(Kinda) fix a few things.