Fixing some