Fixing a few elements