TMP: Fixed signature layout