Signature fixes