Just fixing some random stuff