Fix bunch of things