Fixing some stuff