Fixing some random stuff