Fixes related to the new alternate signatures.
Authored by: spasi 2012-08-18
Parent: [r3786]
Child: [r3788]