Fixing some ... problems