Just some random fixes