fixes for lockbox integration