Fix a few signatures in the xml layout's