Signature Fixes #2