Fixing some stuff ups'