Fix some random stuff