Fixing some stuff.