Fixing some shits