Fix some random things