Fixes for lockbox integration. Hack for signature added, MUST REMOVE